Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 1 Nov 2005 15:02:43 +0000 (16:02 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Tue, 1 Nov 2005 15:02:43 +0000 (16:02 +0100)

Trivial merge